Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream 27.08.2024 #63

Merged
merged 56 commits into from
Aug 27, 2024
Merged

Upstream 27.08.2024 #63

merged 56 commits into from
Aug 27, 2024

Conversation

doublechest0
Copy link
Contributor

О PR

Почему / Баланс

Технические детали

Медиа

  • Я добавил к этому PR скриншоты/видео, демонстрирующие его изменения в игре, или этот PR не требует демонстрации в игре

Changelog

ShadowCommander and others added 30 commits August 25, 2024 19:09
* bagel update

* fixgridatmos

* qm office

* sci cam fix

* jesus christ so many routers

* remove invalids
* Fix-Resprite emote icons

* change scream
* yml part

* guidebook

* commit

* some fixes

* a little

* change
made disposals less bad
5 lines of eaten iocmanager.injectdependencies led to this.
* Predict EmitSoundOnUIOpen

BUI prediction led to this moment.

* unforky
* Change the science radio channel color

* This one looks better
* Move OnGhostAttempt to GhostSystem

* Remove unused dependencies and sort them
* Format DockingSystem.Shuttle

* arrivals system

* docking system

* shuttle console system

* emergency shuttle system

* shuttle system

* thruster system

* Fix compile error

---------

Co-authored-by: Pieter-Jan Briers <[email protected]>
* Guidebook tracks last read entry

* Persistent guidebook fixes

* Persistent guidebook requested changes

* Update Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs

---------

Co-authored-by: Pieter-Jan Briers <[email protected]>
* Remove double-iteration from the mime wall code

* Update

* Update
* Make miner indestructable, and pullable.

* Miners can't be unanchored. Only anchored.

---------

Co-authored-by: JIPDawg <[email protected]>
IProduceWidgets and others added 25 commits August 27, 2024 13:28
* centcomm name and ftlcomp

* networking microopstimization

* go sleep.

* map names and arrivals
* Scale text in admin player overlay

Fixes #30040

* Feedback from PR - get UI scale through root window

---------

Co-authored-by: Eoin Mcloughlin <[email protected]>
* WIP: first prototype

* Change text slightly

* Allow names to wrap

* Add label for the scan mode

* Remove ugly text

* Readd bleeding message

* Update code

* Allow for the Health Analyzer UI to grow vertically
* Disable arrivals message for cryosleep late arrivals

* Provide silent to PlayerSpawnCompleteEvent

* Fix typo

* Move message to event and into arrivals system
* Beginnings of making the breadmemes jobs easier

* stuff

* stuff pt. 2

* Stuff pt.3

* Stuff I forgot last time

* Basic whitelist

Only people that are added to the whitelist with the addwhitelist command will be able to join. I call this the "legacy" whitelist

* Remove always deny condition in favor of just breaking if playtime check fails

* Change default whitelist

Default whitelist is now the "legacy" whitelist.

* localization

* Admin check

* minor spelling change

* Fix build

* Whitelist message

* Fix vars not being datafield and spelling mistakes

* Minor spelling mistake

* Change config for salamander

* Reviews and stuff

* Add summaries

* Fix whitelists

* Forgot to add a datafield

* Fixing stuff I guess

* Reuse admin remarks to reduce load when connecting.

* Update log messages to be verbose instead of debug

* Reviews

* whoops

* Explain a bit more how whitelist checking works

* Apply CE's review

* Append Membership to Blacklist and Whitelist conditions

* Fix review comments

* Uncapitalize playerConnectionWhitelist, add to ignored client prototypes

* Make note count field work

* Fix cvar for thingy

---------

Co-authored-by: Pieter-Jan Briers <[email protected]>
Make nukie plushies a non-contraband item
"Salvage specialist" to "Salvage Specialist"; all is right with the world
@doublechest0 doublechest0 merged commit 35c8aa3 into master Aug 27, 2024
9 of 12 checks passed
Copy link
Contributor

RSI Diff Bot; head commit 0891a2c merging into ea64199
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi

State Old New Status
cotton-slice Added
cotton Added

Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi

State Old New Status
cotton-pizza Added
cotton-slice Added

Resources/Textures/Objects/Consumable/Food/ingredients.rsi

State Old New Status
cotton-dough-flat Added
cotton-dough Added

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.